Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 30 Jan 2012 05:06:59 +0000 (21:06 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 30 Jan 2012 05:06:59 +0000 (21:06 -0800)

Trivial merge